more UI changes, will do moreeeeee