Add some layout and fix bug