Further adjustments to the interface