Readded edit button, fixed table alignment, extended open definition