Interface improvements and bugs fixes