Added bootstrip and fixed lay-out