Updated Layout

Updated Layout
Added new short version calculations
Implemented to work with Mac projects