General changes

changes on many things, especially layout and template.