Controller fixes and DOM relations added