More fronted logic and UI changes