Frontend polish