fixing layout and issue #14