Pre app bar functionality re-design