Try to fix some whitespace
Change markup classes for container and file name