fixed some margins and padding