Briniging UI changes back into master