Bug fixes and correcting the button styling.