cleanup layout + whitespace, add fonts include