layout and functionality updates