Fixed position after expand start, added grid support