UI cleaned up considerably!