Merge "Fixing button colors and order" into main