Re-design the interface