catalogue show, button back to home fixed
home class
conflict fix
fix merge
fix merge