removing timeout from menu
adding layout class
adding layout to type map