removed some "_blank"s and added #modularity