Finish Layout and Routes
wild changes
Merge branch 'filling-in-layout'

Atualizando todo o projeto - Finish layout and routes.