Continued ui implementation
Cleaned the code for UI modifications.