Trying new UI
Bug fix

This is getting buggy.