Finalize and touch up frontend of other pieces of cms