merged Jonas's changes
resolved merge conflict in activity_main