fix some layout mess