Merged master with login2. Images not showing.