Added layouts, pretty test, one contrller and one spec