Updates to styling; updated templates