Add a proper user interface