Added animation and styling
Fixed merge