Corrected logic to handle theme / mobile overloading of views.