007_Fixed naming and side-menu behaviour