Changed to MigLayout and added more components.