Second push of server and ui files added commets in file