Last fixes for last view. Hopefully done now.