go back to viewport as id instead of class
merge in bumbu's changes