#28 Fixed styling