Add place type selector; change layout a bit