Some styling stuff and various other changes