Fix the layout
Fix the call problem