Fixed merging issues affecting login design
Fixed merging issues affecting login design

Fixed issues causing login page to appear in wrong location as well as colour changes and position of ostrich.

int2017/Inspicio,int2017/Inspicio