Fixed bug and layout for list