Front end fixes

Stable, merge it.