Added support for Activity Indicator and Box View