Bug fixes and added bootstrap layout example