Layout changes made. Fixes #48 and #47