fix bug, begin new layout