gui updates now :)
fixed lots of things mainly gui
cleaned up html formatting, mainly
merged branches