Small layout improvements