Added account ifnormation editing,
Added active states for user menu,
merged changes in styles and templates.