Clean up and display fixes