Colour tweaks and position fixes to modal. Also added average views