Added cross-button behaviour; State animations