#403 small fixes on layout