Update layout and fix bug with ordering 0 items