Even more visual improvements...