UI changes, added Flat UI