Merge pull request #97 from jwendl/master

Several bug fixes and layout fixes.