Easy layout change and code cleanup

Printable View