Layout refactor to use width %