Browse Mode features and other fixes