Refactor the UI of options screen