refactored layout
still ref