adjusting some UI settings
finished bulk of the needed code clean up