Lots of fixes & root menu additions