removed all diff
updated css to fix border not showing