Updates grid and expandables, updates form patterns, adds analytics tests