latest changes with bootstrap layout