hand over to Firas to cleanup the drawing methods in MainPage