Merge pull request #1 from krunalsshah/tip_calc_layout

Tip calc layout