Improvements to Menu System + Misc Templates

Fixes Menu System with a near complete rewrite
Small Template Fixes
Small Bean Fixes