little rework on layout