Various visual improvements and fixes