Fixes to display, css classes and calling the right function name