Just merging
made changes to spots to make them appear correctly when on device