Added updated GUI, by Ivan