fixing layout and paths