new layout and mock
init
Fix