[MODIFIED] some changes in views and the logic of the mod