Added more presentable GUI. Changed a couple of class names.