bootstrapizing zinnia
merge with old changes in my laptop