Style and view fixes / updates