After question refactor and some UI cleanup