Corrected css class setting and UI changes.