changed secondmain and display interface
Merge branch 'master' of https://github.com/avivkiss/WHIP_Scaffold
Merge interface change with kenneth's change