Added new features, new GUI