Changing layout for Compose and Edit.

- Cleaning up additional field for Availibity and Location.