Frontend updates 2