added reveals and page transition actions
fixed merge conflicts