big changes, most of the page functionality is done, only styling left