Converting to master branch and push
tweaking styling