some fixes , layout mods