Added transition for buttons
Fixed spacing