[Layout] fix collapse
[Security] fix input type