improved entry ui