WIP UX changes

Changed Calendar VC and Friends VC