Interface Adjustment

Further fine-tuning of interface