Fixed compile errors + menu section