#3 fix for previous commit (forgot about back button)
#3 better animation control; simpler cells animations; some cleanup