Refactoring UI

by Adam Wathan & Steve Schoger

Review: