FIX layout , add bootstap etc