catalog view gallery changes + some fixes