bettered angular template, still needs updated CSS