Remove dead code and make transition between view more fancy