Restructured much of the less code
Made many a layout change