Revamp the UI (Thanks wife!)