code restructured along with 1px issue fix

1px border issue in the bottom tab bar of calendar

UI break in Bottom bar in calendar

1px border issue resolved along with bottom tab bar issue

Code restructured