aved changes
Major redesign, applied mew template etc...