Some badly needed fixes!

Printable View