Resolved some makefile issues
Integrated art's to os image