Ricky changes from monday, w/ landing & signin views
merge error correction