Bug fixes, starting work on new UI