Refactored the Container/Layout relationship into a single Box entity
Implemented all the typical Box layouts
Added new UI test cases