Added MasterDetailView and Draw, other fixes also