Bug fixes, layout changes