Latest UI changes, working on popups