Edited Topic and Home

Left comments to communicate ideas behind code changes and left some
suggestions.