updated styling and fixed template implementation