And some more css / layout changes