Redesigned interface, minor bug fixes