Minor rearrangement and fixed(?) animation for edit/remove