Rebased on top of pillars
Update gitignore to reflect actual location of UI folders