Added, Less support files. Made some design changes