Support for multiple layouts.  Added a combobox to select which layout you want to view.