* Mass refactoring of layout
* Added behavior for filling layout.