refactor in view
added Query and Note widgets