Super update

New GUI and better code organization