Started tidying up markup/formatting as i'm working in Netbeans now