Cleaned up the UI. Though it is not yet implemented.