Fixed Some styling Issues