Views fixes related to activity restructuring