styling
fixed routing errors and styling
merge conflict