Refactoring UI

Adam Wathan & Steve Schoger