Added transitions and some formatting changes