Better display of transitions + canvas resizing
Add bottom margin to activities
Resolve conflicts
Resolve conflicts