Cleaned Up UI.  Some code considation