Working on some styles
merging