worked on some UI