Added custom layout option - fixes #41