few fixes on layout