Include button and reorganise type