hm: style cleanup, editandnew bloc, signup, navbar
hm: fixed merge conflicts