Refactor couple of pages, reorganize styles