fixed some layout issues reported in #3