Design changes to master by Evonne 09 Sept 2014 (Bug #1252085)

Change-Id: I4af9dd67d04085337b12eb0409c0a2812be9c8e5
Signed-off-by: Robert Lyon <robertl@brumbies.wgtn.cat-it.co.nz>