Improve layout and add edit action