Some enhancement to app page