Layout changes, also fixes #34