Added WS & Fixed some design