Views + Controllers + Main cleaned