layout changes works, but looks ugly, need cleanup and more layouts for different sizes.