bug fixes, layout changes