Lock in Portrait
Merge remote-tracking branch 'origin/master'
Added More UI Stuff.