changes layout and tidies code
change font and more tidying of code