Activity flow fixes, layout changes