Modified layout structure to match a maven design