Changed interface layout and cleaned up unused methods