Major revisions to css and added functionality