Fixed file port CSS issues
moved some files into logic