Updated UI and added options pane