version 2
merged
version 2
css tweaks