Completed adaptation to new UI. Resolves #4.