Some layout tweaks
Moved edit button