Changed my files. Still looking for other possible design