Update options and UI improvements