UX improvements
Project build fixes