layout tweaking
merged style changes