Adjusted display and cleaned up some scripts