Change button style and fix spacing