fix issues and change styling