Added remaining functionality and some styling