Initial layout
Removed dead layout code.
Layout Fixes
Merged layout