Fixed frontend problems