UI updates
Removed dericated code and actions