Now use bootstrap layout everywhere
Remove unused template
Remove unused helper and rename other one