html added to client
merged mainstyle