added mobile buttons and media query
fied css merge conflict