Fixed frontend