Clean up basic layout, for iPhone, too