ui fixes and bugs with manual override unwind
manual override is fully functional.  Also added settings bundle.