Changed layout and li id naming