Compare works, login in progress
Moved some stuff around on pages