+ Add framework for unit tests
+ Update layout