cleaned up user interface