Started implement the viewport and fixed some styling issues from before