Continue Minor UI changes