removed autogen views and added layouts