major style refactoring and a few ui tweaks