Fixed formatting and added viewport