Colour Schema and Font Fixed for View
113. story completed conflicts merged