fix for issue #5; little layout fix