updated layouts. still in progress.
push