button color and band color
Merging issue-30 into develop and resolving conflicts'