Merge pull request #52 from sparkbox/firstpage

Firstpage
made some edits, tried to clean up the views
added my changes