some fixes on layout