add fixes for options and title