Reverted to original calendar tab code - Couldn't find worthwhile improvement
Merge conflicts