Refactored the way the interface looks.