options page styling updates
Merge branch 'master' into test/options
added clear functionality for file field; some bugfixes and styling updates
Merge branch 'master' into test/options