Some styling & small bug fixes