some fixes on layout..