Refactored and rethinked UI