fixed error showing and button color
Merge branch 'stage'