Button and style fixes