updated styles
updated styles part two
fixed merge