added #2
fixed layout