Cleaned up user interface.