Functionality and styling improvements