Changing layout for Compose and Edit.

- Cleaning up additional field for Availibity and Location.
Merge pull request #76 from Hawk-It/compose_edit_layout

Changing layout for Compose and Edit.