Complete redesign with minimum JS