Add Home link plus others minor changes