Switched to final GUI structure