Cleaned up 1.5 branch, submenu cpu's now working