Some styling and feature updates