Cleaned up add or edit entry view