Massive interface cleanup and improvements