updated header
css styling
merged master with css styling