Feature/layout reorganization

Passed RSPEC