Cleaned up naming and made the edit button toggle-able