UI: Made the interface cleaner