Switch Layout

update layout
Revert "Switch Layout"

This reverts commit 3285fcacf2797b82e9ea1732e9dd726ff03f79da.