Trying to fix the UI