latest update including rearrangement of css and templates
latest update including rearrangement of css and templates2