A little bit of work on styling, implemented catalog pages, moved form class to there own file