C3 toka viewbi

@yasmin-eltahan 
#184 
#140 
#154