Added styling, css classes and small bug fixes