Fixed entire frontend