Add border-radius and cleaned up borders