fix integration
update cntBody to cardLayout
fixing
add toolbar
merge from jonathan
fixing merge menu left manual