Refactor image size logic into get_width_height function
Change "Upload" to "Add" as we're potentially not actually uploading... the semantics was bugging me

TODO: Should probably handle this properly with locales at some point