Layout Refactoring + Improvements