clean code; ui changes