Changed layout of header and account tpl files