Bug fixes, layout fixes