Small updates
Add static pages
Update controller