added calendar & re-style