Added functionality and styling changes