Merge issues
buttons and images