More work on the main form display