added ribbon and other changes
attempting to merge remote master with local master