Theme admin view bug fixes