#354 bugfix for returning from other activities
#360 add custom graphs