Continued on the front-page concept. + fixed some bugs