Fix for fronted jquery bug/ UI fixes