Fixing some display stuff
Clean up