Work in progress. Commit point before trying alternative layout to gridbag