Added more functionality and styling