Fixed color according to navbar for buttons
Merge with Liz's delete branch