Modify and simplify the layout, I droped those animation.