Cleaned Up the UI a bit more