Clean up
Auto Layout closes #3