Issue : Design layout for WS