Twitter Bootstrap addition & improved lay-out