MOre css and resolved some logic issues related to html issues