fixed some problems with html elements and added table