refactored, reused layout
refactored, reused layout