Added some CSS class names
Display fixes