tracking added, permission check added, collapse/expand menu added, functional views without javascripts