Fix typos and create easier layout