Finishing touches on main view