small fixes on layout