Adding look and feel
Merging
Merging