changed around files and fixed css