merged with updated master branch
added simple css styles to options page
merged with options page branch