Revised GUI