Fix broken layout and add new info