Adding bootstrap, improving template