Undefined variable fix
Improved file categories
Menu link adding fix