avoid null for viewport, fixed #55
readd icon to bootstrap submit button (fixed #56)