GUI major re-vamp