Fixed bug fixes and styling errors