update partial names and refactor layout