added viewport, boostrap improvements