Added some more functionality and styling