Some style clean up. Heading for button style next