change layout and add icons