Refactor and add padding to new guide preview