Fix broken layout and tweak list