Further visual improvements