Merged with master
View update
Added Layouts for Index and User views