UI calendar fixes