Fix some stuff up, get rid of date picker for now