Cleaned up Code in UI

Still need DB scripts