Fix layout issue on WP3.8+