Css update and buttons
Fix buttons css
Fix merge