Refinement

Finishing touches, removing unused code, and improving the uploading
experience with portrait and landscape views