Added fetching data from server and some teplate changes