Made cleaner UI