login and home fixed to new format