styling map buttons
css merge conflict...
remove stories transition page
merging develop