Button style fixes & functionality