added additional features incl ribbon
Merge branch 'staging'