Re-did base QUI layout