Swapped to using angular services and following standard layout