minor fixes layout