updated views, logic, search
views profile commit
solved conflitcts