Cleaned the user interface classes