Option/user option/ACP menu overhaul