Merge pull request #106 from isuftin/master

WPS progress
Normalized upload button to have a normal button look/feel

Added appropriate icons/language to all buttons