Add main layout
Add views
Fix indentation