Refactored UI a bit