Updated layout and icons