Pull request to master

For readability, create separate methods for the animations. e.g. `animateShow/Hide`