fix checkbox bug, map layout, remove buttons