Universal app

Updated layout to make universal app and to add constraints