Style and display updates
Clean up