Layout changes for edit event

Change-Id: I01a4fd088057fa156709ca096530baf891908d9c
12 files changed