Finished new options implementation along with delete buttons. Various bug fixes.