marker for where you are; slightly better layout
merge