Updated the formatting, still need to work on standard formatting with layouts