Started work on UI code, fixed map generation to quote attr values