Small CSS fixes in order to avoid container height flashing