add animations and some view cleanups