refactored layout and scaling system - no complete
resolving conflicts in merge