config  fix + layout weaks.