dev -> master merge: layout and style implementation re-factor.