Changed the keyword layout and type layout