many layout fixes; add map buttons