Made app universial