More navigation and animation work