Layout Fix's
Merge branch 'localdev' into develop