Rework interface layout