Redesign UI to match the global style child of #16
Redesign UI to match the global style
child of #16