Simplify code a bit
Quite properly implement dates in the app
Small layout fix