on way to cleaner ui