merging with master
modified setings for portability
slight modification to models layout style
merging