Added basic layout options. Fixes #12