merging
merging
Added some styling other small fixes