Updated UI and added options part