Implements #Websitecontent and Fixed #CommandsTest