Will attempt to better the view in the next version