Changed layout, fiddlings with views/controllers