Merged picture and fixed login branch