updated with latest dev branch

updated with latest dev branch & started styling