Removed the special handled of CDROM and add raise to the top option