Changed styles ans reordering code