working on styling
merging..
styling..