Implemented logout && added some todos