fix components and working master view