Progress on layout
Major Layout updates.