Made the user interface more consistent