Minor Container View Fixes