Fix Moat height and searchbar include