Client improved and add dumy data to make screenshots