Working on adding in titles and better display

Eventually going to actually make it look nice