#41 further progress on layout, buttons now mapped to functions