Cleaned up the ui lay a bit code still needs to be refactored.