fixing the UI