Adding support files to local path
Improvements to layout and the user feedback