Improved formatting content etc
Added second level enteries