fixing top bar + rm cart (new location !)