Styling updates and some bug fixes