updated with simple UI fixes and reorganization prior to map layer experiment