rewrite to use a single grid panel with manual layout