new layout, some animations added